Auto merge of #1282 - vrinek:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 9 Feb 2015 19:24:58 +0000 (19:24 +0000)
committerbors <bors@rust-lang.org>
Mon, 9 Feb 2015 19:24:58 +0000 (19:24 +0000)
commit395b7f4a59a32329c44c2486bd76a10850f68795
treedf927ca92e7beaaf86e7192cf65e65dfc2eb85fc
parentdfd4868c0993f3a0ad24ae6032d05c8142c5596e
parent96b2e3acfcb8d0e95f88aa83214105f33738162e
Auto merge of #1282 - vrinek:master, r=alexcrichton